From bdb451ad863a0e6cdae40dfc302564cb09059274 Mon Sep 17 00:00:00 2001
From: Lapo Calamandrei <calamandrei@gmail.com>
Date: Tue, 19 Apr 2016 00:11:09 +0200
Subject: [PATCH] Adwaita: fix infobar text color in backdrop windows

see https://bugzilla.gnome.org/show_bug.cgi?id=765213
---
 gtk/theme/Adwaita/_common.scss           | 11 +++++---
 gtk/theme/Adwaita/gtk-contained-dark.css | 33 +++++++++++++++++++++---
 gtk/theme/Adwaita/gtk-contained.css      | 33 +++++++++++++++++++++---
 3 files changed, 66 insertions(+), 11 deletions(-)

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 43cfbc1d03..ed161edf42 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -3866,10 +3866,15 @@ infobar { border-style: none; }
 .question,
 .warning,
 .error {
-  background-color: $selected_bg_color;
-  color: $selected_fg_color;
+  &:backdrop, & {
+    label, & { color: $selected_fg_color; }
+    background-color: $selected_bg_color;
+    border-color: darken($selected_bg_color, 10%);
+  }
+
   text-shadow: 0 1px darken($selected_bg_color, 10%);
-  border-color: darken($selected_bg_color, 10%);
+
+  &:backdrop { text-shadow: none; }
 
   button {
     // FIXME: extend selection mode buttons
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index af01177bde..de6655a850 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -4113,10 +4113,35 @@ infobar {
 .question,
 .warning,
 .error {
-  background-color: #215d9c;
-  color: #ffffff;
-  text-shadow: 0 1px #184472;
-  border-color: #184472; }
+  text-shadow: 0 1px #184472; }
+  .info:backdrop, .info,
+  .question:backdrop,
+  .question,
+  .warning:backdrop,
+  .warning,
+  .error:backdrop,
+  .error {
+    background-color: #215d9c;
+    border-color: #184472; }
+    .info:backdrop label, .info:backdrop, .info label, .info,
+    .question:backdrop label,
+    .question:backdrop,
+    .question label,
+    .question,
+    .warning:backdrop label,
+    .warning:backdrop,
+    .warning label,
+    .warning,
+    .error:backdrop label,
+    .error:backdrop,
+    .error label,
+    .error {
+      color: #ffffff; }
+  .info:backdrop,
+  .question:backdrop,
+  .warning:backdrop,
+  .error:backdrop {
+    text-shadow: none; }
   .info button,
   .question button,
   .warning button,
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 5a7fce5686..a7cb2c91fb 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -4142,10 +4142,35 @@ infobar {
 .question,
 .warning,
 .error {
-  background-color: #4a90d9;
-  color: #ffffff;
-  text-shadow: 0 1px #2a76c6;
-  border-color: #2a76c6; }
+  text-shadow: 0 1px #2a76c6; }
+  .info:backdrop, .info,
+  .question:backdrop,
+  .question,
+  .warning:backdrop,
+  .warning,
+  .error:backdrop,
+  .error {
+    background-color: #4a90d9;
+    border-color: #2a76c6; }
+    .info:backdrop label, .info:backdrop, .info label, .info,
+    .question:backdrop label,
+    .question:backdrop,
+    .question label,
+    .question,
+    .warning:backdrop label,
+    .warning:backdrop,
+    .warning label,
+    .warning,
+    .error:backdrop label,
+    .error:backdrop,
+    .error label,
+    .error {
+      color: #ffffff; }
+  .info:backdrop,
+  .question:backdrop,
+  .warning:backdrop,
+  .error:backdrop {
+    text-shadow: none; }
   .info button,
   .question button,
   .warning button,
-- 
2.30.2